Skip to content

chore: merge upstream/main into fork (2026-11-13) - #577

Open
adampeterhiggins wants to merge 460 commits into
mainfrom
t3code/sync-upstream-2026-11-13-1506
Open

chore: merge upstream/main into fork (2026-11-13)#577
adampeterhiggins wants to merge 460 commits into
mainfrom
t3code/sync-upstream-2026-11-13-1506

Conversation

@adampeterhiggins

@adampeterhiggins adampeterhiggins commented Nov 13, 2026

Copy link
Copy Markdown
Owner

What's in this sync

Adds 458 upstream commits from November 12–13.

New features include keeping the computer awake while agents work, Codex cyber access program selection, managed Antigravity goals and CLI updates, OpenCode server usage limits, spreadsheet row/column resizing, folder drops to add projects, secret validation and mobile secret visibility.

Fixes cover provider prompts and recovery, thread navigation and queue handling, preview rendering, GitHub watch events, and remote connections. Performance work reduces history reads for long threads, speeds terminal attachment over slow connections and reduces mobile startup data.

New features

Notable performance changes

Remaining commits

Discord announcements were not used: the channel returned only October 20 messages, with no matching crossposts or announcement embeds.

Integration

Base: 1f27a682e16a2ab872ca34f57f2bba35e9394af5 (main). Pinned upstream: f313d0a6cb843551fb60e57a454a71e71a3a8c04. Range: 1f27a682e16a2ab872ca34f57f2bba35e9394af5..f313d0a6cb843551fb60e57a454a71e71a3a8c04. No parent PR. Before merging, the fork had 659 fork-only commits and was missing 458 upstream commits.

Current main advanced while verification ran. A second merge commit incorporates the GitHub file-link and Slack image-link changes from #575 and #576; upstream history remains intact.

Conflict resolutions

  • Preserved fork web tabs, composer context and integrations, account/custom editor controls, citation-only sends, sidebar pages, filters and groups. Integrated upstream focus restoration and collapsed Stop action. ChatView and Sidebar changes were not file splits in this range; existing extracted fork components retain their callers.
  • Kept mobile tabs/groups/filters and multi-host pull-request matching while adopting steady sidebar snapshots and generic PR helpers. Review caught a held-row subscription-limit action overwriting a newer model choice; the regression fails before the fix and passes afterward.
  • Combined server orchestration, provider and browser-host changes with fork behavior and tests; kept upstream signatures, gh-default repository resolution, and provider-specific usage rates. Preserved the fork's remote-delegation extension in its documentation.
  • Desktop retains quick-message and appearance layers while using upstream's shared SSH layer for updates. README uses upstream layout with the fork note; gitignore keeps both local editor and SSH fixture exclusions.

Verification

  • Passed focused package typechecks for contracts, web, mobile, desktop, server, client runtime, ACP, Cursor, OpenCode and source-control definitions. Final changed-file typecheck phase passed all 41 tasks after correcting the eval fixture dependency; scripts typecheck passed separately after an initial resource kill.
  • Focused tests pass: server 818 cases across 15 files, pricing/aggregation 33, web 620 across 11 files, mobile/shared 329 across 12 files plus the 47-case mobile action regression pass, desktop 27, and the eval background-wait fixture case.
  • Changed-file checks passed format, lint, both Knip phases, GraphQL generation, unused patches, 34 Node tests and 318 React compiler tests. This used a scratch copy of check:changed with browser test execution excluded under the requested restriction. The broad 625-file test phase reached its 900-second timeout; it is not a passing full-suite result. The earlier parallel typecheck failure is superseded by the successful final phase and focused checks.
  • Catch-up merge: all 25 changed files pass format/lint; six affected package typechecks pass; GitHubIssues, SlackApi and composerObjectLinks pass 73 focused tests.
  • git diff --check is clean for resolutions and non-patch changes; the upstream Pierre dependency patch carries space-before-tab patch context, preserved unchanged.
  • MCP model context generation passes. Paid model behavior evals were not run (no eval API-key .env configured). Browser tests, runtime UI automation, merges and releases are excluded per the requested scope.

Earlier runs were settled as superseded: one failed before a checkout was created; the other had a clean checkout, no pinned upstream/merge/unpushed work, and no recovery notes. Their branches/worktrees were left in place.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.

Model: gpt-6.1-sol. Harness: Codex in T3 Code.

juliusmarminge and others added 30 commits November 12, 2026 14:37
@juliusmarminge @claude
perf(ci): run server test files in parallel on each shard (pingdotgg#…
a3cde98 
…35618)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@dependabot @maria-rcks @juliusmarminge
chore(deps): bump the npm_and_yarn group across 2 directories with 1 …
aa58dc6 
…update (pingdotgg#33945)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@maria-rcks @nateEc @juliusmarminge
fix(server): keep worktrees containing nested repositories (pingdotgg…
8753c74 
…#25241)

Co-authored-by: Yukun Shan <92423096+nateEc@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@samkelly880 @juliusmarminge
fix(shared): Windows-style paths stay out of the slash menu (pingdotg…
f41e8b3 
…g#27851)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@ParasN @YMiyya
@maria-rcks @juliusmarminge
fix(acp): let agents that advertise /compact compact their own context (
ac7c7f6 
pingdotgg#28822)

Co-authored-by: ParasN <25337333+ParasN@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
test(acp-registry): subscribe to snapshot changes before triggering t…
2f9d930 
…hem (pingdotgg#35627)
@voltcrash @maria-rcks @juliusmarminge
fix(web): diff colors follow appearance contrast (pingdotgg#28947)
fbd77b9 
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@ScottN-PV @maria-rcks @juliusmarminge
fix(web): keep the child thread open when its remote parent was delet…
dfded9d 
…ed (pingdotgg#27436)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@tao12345666333 @juliusmarminge
fix(desktop): poll for updates every 4 hours, not 4 minutes (pingdotg…
731291e 
…g#28481)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@jokaperes @maria-rcks @juliusmarminge
fix(usage): bill Codex requests whose cumulative counters rewind to a…
9a614e3 
…n earlier snapshot (pingdotgg#29366)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@nateEc @maria-rcks @juliusmarminge
fix(server): persist terminal output without rewriting all history (p…
65716ba 
…ingdotgg#24019)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@bompus @juliusmarminge
perf(server): stop serializing terminal chunks just to measure them (p…
8bfb723 
…ingdotgg#24179)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@fixfon @maria-rcks @juliusmarminge
fix(web): stop opening a menu when a terminal selection ends (pingdot…
4cd7a3e 
…gg#24112)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
fix(server): agents keep named browser profiles after a server restart (
30a26db 
pingdotgg#23484)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@voltcrash @juliusmarminge
fix(web): reveal full composer command descriptions (pingdotgg#27414)
9b242e4 
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@maria-rcks @shivamhwp @juliusmarminge
fix(server): restart the service after T3 home ownership clears (ping…
44ee2b9 
…dotgg#25237)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@toni92-beep Toni Angerer @juliusmarminge
fix(web): Enter on an empty prompt resumes an interrupted thread (pin…
a344276 
…gdotgg#27079)

Co-authored-by: Toni Angerer <toni@MBP-von-Toni-5.fritz.box>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(shared): token counts just below a unit boundary use the next unit (
9ac4535 
pingdotgg#35634)
@only21mil @juliusmarminge
fix(desktop): long annotation strokes stay cheap to draw (pingdotgg#2…
0685635 
…4573)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@nabettu @juliusmarminge
fix(ssh): load remote profiles with the account login shell (pingdotg…
058d953 
…g#23934)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@TonybynMp4 @juliusmarminge
fix(server): terminals recreate a worktree removed by storage cleanup (…
da345d2 
…pingdotgg#24156)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
test(web): Mod+E bold-word test no longer drops its first arrow key (p…
95f164d 
…ingdotgg#35646)
@juliusmarminge
fix(server): access list keeps changes made while its stream opens (p…
3595b9e 
…ingdotgg#35640)
@juliusmarminge
fix(server): a failed Git version probe no longer advises installing …
c544c27 
…Git (pingdotgg#35638)
@only21mil @maria-rcks @juliusmarminge
fix(server): PR worktrees keep local commits on an existing branch (p…
14978e3 
…ingdotgg#24674)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@guryanov-a @maria-rcks @juliusmarminge
fix(web): branch labels keep the space before a middle-truncated name (…
c699562 
…pingdotgg#23627)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@fixfon @maria-rcks @juliusmarminge
fix(server): stale provider update results clear once the provider is…
13034bf 
… up to date (pingdotgg#24338)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Batuhan1999 @juliusmarminge
perf(server): merged-PR threads no longer re-read git state every min…
a0844ea 
…ute (pingdotgg#24099)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(server): pending request reads keep question option previews (pin…
d9bed93 
…gdotgg#35644)
@maria-rcks @Zheruel @juliusmarminge
fix(opencode): preserve owned turns during server recovery (pingdotgg…
a135972 
…#25596)

Co-authored-by: Tin Zeljar <35663757+Zheruel@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 30 commits November 12, 2026 23:58
@juliusmarminge
fix(forgejo): tea API failures keep Gitea's reason (pingdotgg#32244)
0902adc
@juliusmarminge
fix(server): reap recorded Linux Claude survivors before recovery (pi…
e4025c8 
…ngdotgg#22834)
@juliusmarminge @claude @Yash-Singh1
fix(web): open documents no longer reload after every agent command (p…
08544ba 
…ingdotgg#32693)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
@juliusmarminge
fix(desktop): AppImage quit no longer leaves zygotes running on an un…
84efa01 
…mounted image (pingdotgg#36057)
@Gourav224 @maria-rcks @juliusmarminge
fix(server): a message sent after a stopped worktree setup waits inst…
4225c9d 
…ead of running in the project checkout (pingdotgg#23618)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
test(server): terminal checkout test waits for the refresh's last eve…
7e1a058 
…nt (pingdotgg#36071)
@juliusmarminge
fix(provider-core): Vite+ provider updates respect npm's release-age …
290182d 
…policy (pingdotgg#32340)
@PedroNavHur @juliusmarminge
fix(web): point pairing copy at Sharing & access (pingdotgg#27692)
6790f85 
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(web): turn diffs cut off at the size limit say changes are incomp…
5f69cac 
…lete (pingdotgg#36079)
@juliusmarminge
fix(web): narrow-window right panel dialog is named Workspace panel (p…
082a3e3 
…ingdotgg#36085)
@juliusmarminge
fix(server): thread reads preview linked PRs and list_thread_pull_req…
eb7e63a 
…uests pages (pingdotgg#35858)
@juliusmarminge
fix(web): new project publish option tells screen readers whether it …
74573fc 
…is on (pingdotgg#36090)
@juliusmarminge
fix(server): preview drag moves the mouse during the drag (pingdotgg#…
ed05c0e 
…36096)
@juliusmarminge
fix(server): a fresh-session scheduled run no longer takes over the t…
bd7d264 
…hread's conversation (pingdotgg#36103)
@juliusmarminge
fix(server): deferred-steer check and queued cancel no longer read a …
10fbff5 
…thread's whole history (pingdotgg#36100)
@saphitv @juliusmarminge
fix(composer): keep reviews from different Git hosts in suggestions (p…
21b0b7a 
…ingdotgg#36104)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(web): terminal "Add to chat" now adds to a queued message being e…
ed7e501 
…dited (pingdotgg#36117)
@juliusmarminge
fix(mobile): a final answer followed by more work in the same run sta…
a044f0c 
…ys visible (pingdotgg#36116)
@Bil0000 @shivamhwp
fix(web): a server updated with the app reconnects as soon as it is r…
fa9d85f 
…eady (pingdotgg#35327)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
@juliusmarminge
fix(acp): Copilot runs end when its reply is done, not when its async…
7903b48 
… shells exit (pingdotgg#36122)
@juliusmarminge
fix(server): a link forgotten mid-resolve says it is not linked (ping…
08be782 
…dotgg#36132)
@juliusmarminge
fix(server): t3_queue and handoff analytics no longer read a thread's…
4aec277 
… whole history (pingdotgg#36130)
@juliusmarminge
perf(server): shell reads of a worktree or family no longer parse eve…
2d8a843 
…ry thread payload (pingdotgg#36146)
@juliusmarminge
fix(desktop): Local environment off survives an unreadable value in d…
c7a3f02 
…esktop-settings.json (pingdotgg#36168)
@juliusmarminge
fix(mobile): a sub-agent opened from its parent on a narrow iPad keep…
095611d 
…s Back (pingdotgg#36175)
@juliusmarminge
fix(server): Codex usage answering after three seconds is no longer d…
8610b31 
…ropped (pingdotgg#36189)
@shivamhwp @claude
fix(mobile): iOS terminal font and theme changes no longer replay out…
9a35ab0 
…put (pingdotgg#36115)

Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
@shivamhwp @maria-rcks
fix(server): stop device daemon alongside slow hub shutdown (pingdotg…
f313d0a 
…g#33566)

Co-authored-by: maria-rcks <maria@kuuro.net>
@adampeterhiggins
chore: merge upstream/main into fork
23d5d27 
# Conflicts:
#	.gitignore
#	README.md
#	apps/desktop/src/main.ts
#	apps/mobile/src/features/home/HomeRouteScreen.tsx
#	apps/mobile/src/features/home/useThreadListActions.test.ts
#	apps/mobile/src/features/home/useThreadListActions.ts
#	apps/mobile/src/features/threads/ComposerCommandPopover.tsx
#	apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
#	apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx
#	apps/mobile/src/features/threads/ThreadQueueControl.tsx
#	apps/mobile/src/features/threads/ThreadRouteScreen.tsx
#	apps/mobile/src/features/threads/use-composer-command-menu.ts
#	apps/mobile/src/lib/threadActivity.ts
#	apps/mobile/src/state/queries.test.ts
#	apps/mobile/src/state/queries.ts
#	apps/mobile/src/state/thread-order.ts
#	apps/mobile/src/state/use-thread-composer-state.ts
#	apps/server/scripts/migrate-dev-db.ts
#	apps/server/src/git/GitManager.test.ts
#	apps/server/src/mcp/McpHttpServer.test.ts
#	apps/server/src/mcp/OrchestratorMcpService.ts
#	apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts
#	apps/server/src/mcp/TaskCancelUsageLimit.integration.test.ts
#	apps/server/src/mcp/toolkits/core.test.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
#	apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
#	apps/server/src/orchestration-v2/Orchestrator.ts
#	apps/server/src/orchestration-v2/ProjectionStore.ts
#	apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
#	apps/server/src/orchestration-v2/ProviderTurnStartService.ts
#	apps/server/src/orchestration-v2/PullRequestWatchReactor.ts
#	apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts
#	apps/server/src/orchestration-v2/ShellStream.ts
#	apps/server/src/orchestration-v2/ThreadLaunchService.ts
#	apps/server/src/orchestration-v2/pullRequestWatch.test.ts
#	apps/server/src/orchestration-v2/pullRequestWatch.ts
#	apps/server/src/preview/ServerBrowser.test.ts
#	apps/server/src/preview/ServerBrowser.ts
#	apps/server/src/preview/ServerBrowserPage.ts
#	apps/server/src/project/RepositoryIdentityResolver.ts
#	apps/server/src/provider/AntigravityInstallation.test.ts
#	apps/server/src/provider/Drivers/CodexDriver.ts
#	apps/server/src/provider/ProviderInstanceRegistry.test.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/server.ts
#	apps/server/src/terminal/Manager.ts
#	apps/server/src/usage/UsageService.test.ts
#	apps/server/src/usage/UsageService.ts
#	apps/server/src/ws.ts
#	apps/web/src/components/BranchToolbarBranchSelector.tsx
#	apps/web/src/components/ChatMarkdown.browser.test.tsx
#	apps/web/src/components/ChatMarkdown.tsx
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
#	apps/web/src/components/Sidebar.logic.test.ts
#	apps/web/src/components/Sidebar.logic.ts
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/ThreadTerminalDrawer.test.ts
#	apps/web/src/components/ThreadTerminalDrawer.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/ComposerCommandMenu.tsx
#	apps/web/src/components/chat/MarkdownExternalLink.tsx
#	apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
#	apps/web/src/components/chat/MessagesTimeline.logic.test.ts
#	apps/web/src/components/chat/OpenInPicker.tsx
#	apps/web/src/components/chat/QueuedRunsControl.browser.test.tsx
#	apps/web/src/components/chat/TimelineWorkEntryRow.tsx
#	apps/web/src/components/chat/turnDetailAnnouncement.ts
#	apps/web/src/components/chat/useComposerSend.ts
#	apps/web/src/components/chat/useQueuedRunEdit.ts
#	apps/web/src/components/chat/useThreadLifecycle.tsx
#	apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
#	apps/web/src/components/settings/CodexSetupSection.tsx
#	apps/web/src/components/settings/ConnectionsSettings.tsx
#	apps/web/src/components/settings/settingsSearch.ts
#	apps/web/src/components/sidebar/SidebarDraftBlock.tsx
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
#	apps/web/src/composer-logic.test.ts
#	apps/web/src/composerDraftStore.ts
#	apps/web/src/hooks/useThreadActionMenu.ts
#	docs/user/thread-sidebar.md
#	packages/client-runtime/src/state/commandPermissions.test.ts
#	packages/client-runtime/src/state/entities.test.ts
#	packages/client-runtime/src/state/models.ts
#	packages/client-runtime/src/state/threadExecution.test.ts
#	packages/client-runtime/src/state/threadExecution.ts
#	packages/client-runtime/src/work-log/itemDetail.ts
#	packages/client-runtime/src/work-log/userInput.test.ts
#	packages/client-runtime/src/work-log/userInput.ts
#	packages/contracts/src/orchestrationV2.ts
#	packages/contracts/src/orchestratorMcp.ts
#	packages/contracts/src/rpc.ts
#	packages/provider-acp/src/server/adapter.ts
#	packages/provider-cursor/src/server/CursorSdk.test.ts
#	packages/provider-cursor/src/server/adapter.ts
#	packages/provider-opencode/src/server/adapter.test.ts
#	packages/provider-opencode/src/server/driver.ts
#	packages/shared/src/orchestrationV2PendingBackgroundWork.test.ts
#	packages/source-control-definitions/src/composerPullRequestMatches.test.ts
#	packages/source-control-definitions/src/composerPullRequestMatches.ts
@adampeterhiggins
chore: catch upstream sync up with current fork main
29270c6

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.